From 76960d529d5b98f565ffedbecb14071e46afd89c Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sun, 23 Jan 2011 11:34:39 +0100 Subject: [PATCH] Improve configuration of makeinfo. * Makefile.in (MAKEINFO): Now controlled by `configure'. (MAKEINFO_OPTS): New variable. Use it where appropriate. (ENVADD): Updated. --- doc/emacs/ChangeLog | 6 ++++++ doc/emacs/Makefile.in | 10 ++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 5b53f873630..cf00308d28c 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,9 @@ +2011-01-23 Werner Lemberg + + * Makefile.in (MAKEINFO): Now controlled by `configure'. + (MAKEINFO_OPTS): New variable. Use it where appropriate. + (ENVADD): Updated. + 2011-01-18 Glenn Morris * ack.texi, emacs.texi (Acknowledgments): Update for ERT addition. diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in index 441a08f3be0..f3dbda1325c 100644 --- a/doc/emacs/Makefile.in +++ b/doc/emacs/Makefile.in @@ -39,14 +39,16 @@ texinfodir = $(srcdir)/../misc # The makeinfo program is part of the Texinfo distribution. # Use --force so that it generates output even if there are errors. -MAKEINFO = makeinfo --force -I $(srcdir) +MAKEINFO = @MAKEINFO@ +MAKEINFO_OPTS = --force -I $(srcdir) TEXI2DVI = texi2dvi TEXI2PDF = texi2pdf DVIPS = dvips -ENVADD = TEXINPUTS="$(srcdir):$(texinfodir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)" +ENVADD = TEXINPUTS="$(srcdir):$(texinfodir):$(TEXINPUTS)" \ + MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)" EMACS_XTRA= \ @@ -129,7 +131,7 @@ ps: emacs.ps $(infodir)/emacs: ${EMACSSOURCES} $(mkinfodir) - $(MAKEINFO) -o $@ $< + $(MAKEINFO) $(MAKEINFO_OPTS) -o $@ $< emacs.dvi: ${EMACSSOURCES} $(ENVADD) $(TEXI2DVI) $< @@ -141,7 +143,7 @@ emacs.pdf: ${EMACSSOURCES} $(ENVADD) $(TEXI2PDF) $< emacs.html: ${EMACSSOURCES} - $(MAKEINFO) --html -o $@ $< + $(MAKEINFO) $(MAKEINFO_OPTS) --html -o $@ $< emacs-xtra.dvi: $(EMACS_XTRA) $(ENVADD) $(TEXI2DVI) $< -- 2.30.2